Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 9 Jul 2011 08:19:41 +0000 (01:19 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 9 Jul 2011 08:19:41 +0000 (01:19 -0700)
commit377d04202382666b0f5e9335e64693bc3f447ff6
tree3dbf11be3768c4ca43440e731215a78f5a410d46
parentb12a34e6e9daeefc5b4240cdabe1aade99fbe94e
parent2c0328710e11997ac7b40326aff2de598facf1e9
Merge from trunk.